hg diffとgit diffの出力の違い
hg diff:
% hg diff
diff --git a/p.c b/p.c
--- a/p.c
+++ b/p.c
@@ -1,26 +1,25 @@
#include <stdio.h>
# OS X 10.9.2 | |
# CPU 2.3 GHz Intel Core i7 | |
# MEM 16GB 1600 MHz DDR3 | |
% hg clone http://selenic.com/hg | |
% cd hg | |
# hg locate + grep | |
% for i in $(seq 3); do time (hg locate | xargs grep -n -i ctx.walk > /dev/null) ; done | |
( hg locate | xargs grep -n -i ctx.walk > /dev/null; ) 0.73s user 0.06s system 97% cpu 0.807 total |
% cat hoge.txt | |
--- /dev/null | |
+++ b/new.txt | |
@@ -0,0 +1,1 @@ | |
+aaa | |
diff --git a/exist.txt b/exist.txt | |
index 1d95c52..8bffa50 100644 | |
@@ -0,0 +1,1 @@ | |
-bbbb | |
+aaaa |
hg diffとgit diffの出力の違い
hg diff:
% hg diff
diff --git a/p.c b/p.c
--- a/p.c
+++ b/p.c
@@ -1,26 +1,25 @@
#include <stdio.h>
--- rails-4-2-stable_initialzer.txt 2015-03-23 18:02:56.000000000 +0900 | |
+++ rails-master_initializer.txt 2015-03-23 18:03:30.000000000 +0900 | |
@@ -9,10 +9,11 @@ | |
-- action_mailer.logger before: after: | |
-- action_mailer.set_configs before: after:action_mailer.logger | |
-- action_view.caching before: after:action_view.set_configs | |
+ -- action_view.collection_caching before: after:action_view.caching | |
-- action_view.embed_authenticity_token_in_remote_forms before: after: | |
-- action_view.logger before: after:action_view.embed_authenticity_token_in_remote_forms | |
-- action_view.set_configs before: after:action_view.logger |
PWD=$(shell pwd) | |
EMACS_REPOS_DIR=emacs-git-repos | |
EMACS_DAILY=emacs-daily | |
EMACS_DAILY_DIR=emacs-daily-$(shell date +%Y%m%d%H%M) | |
CONFIGURE_OPTIONS= | |
.PHONY: all link build repository-update repository-init | |
all: build |
# configurations | |
BIN_DIR = File.expand_path("~/bin/") | |
INSTALL_DIR = File.expand_path("~/bin/rubys/") | |
P185 = "p231" | |
P186 = "p369" | |
P187 = "p174" | |
P191 = "p129" | |
JRUBY_VER = "1.3.0" |
Attribute VB_Name = "ExcelUtil" | |
Sub ActivateA1All() | |
Dim Index | |
For Index = 1 To Worksheets.Count | |
With Worksheets(Index) | |
.Activate | |
.Cells(1, 1).Activate | |
End With | |
Next |
;;; im-kayac.el --- Post im.kayac.com | |
;;; test code | |
;; - 認証なし | |
;; (setq im-kayac-username "username") | |
;; (setq im-kayac-authorization-type nil) | |
;; | |
;; - パスワード | |
;; (setq im-kayac-username "username") | |
;; (setq im-kayac-password "password") |
;; astar.el -- A* Algorithm implementation | |
(require 'cl) | |
(defstruct (astar-node-struct | |
(:constructor astar-make-node-struct | |
(&key pair parent f-star))) | |
pair parent f-star) | |
(defun astar-node-struct-pair-pair-equal (node pair) |
public class Player { | |
protected Long id; | |
protected PlayerBehavior behavior; | |
protected String name; | |
protected String club; |